changed transitions and fixed button positions