Numerous layout updates