Fixed the layouts issue. Spacing is now uniform everywhere