Commit including some GUI work