Fix some visual oddities, do some cleanup