Intermediate commit
GUI refined