mainly changes in GUI