Small fixes and layout updates