Changed GUI according to the requirements