Some work on mainly GUI related stuff