Adjusted the layouts