Layouts bug fixed