Fixed some small issues
More adjustments for the new layout.