Fixed the Layout to look more properly regarding the different elements