Add taskbar
Fix some crap