Changes to layout and other minor stuff