Made some changes to GUI