Various styling and structure improvements