Fixing the fixes, moving some buttons to enhance UI