merge
made gui bigger