Topic/styling2

Fixed some styling problems from the meeting today.