Fixes and layout updates