layout files fixes