Last fixes for layout