Graphical fixes
Add some stuff, (push to sync, incomplete)