fixed transitions and button issues