Further changes to layout