Finally fixed the layout (how I want it)