Bug & styling fixes, mostly