Major GUI improvements