More styles and fixes and stuff