Fixing flip bug and button borders