Minor tweaks
Finish styling