Fixed all the Layouts