Fixed rest of layout for public view