Major changes in the gui