corrected all layouts