edited layout to fit the newest changes