Tidy up appearance and move styles into common.