Fixed button bug and screen transition