A bit of import fixes
Moved buttons slightly to the right