Various fixes to styling and contents