Fix up some styling and design issues