More layout updates
Polish