more explicit layout related fixes