GUI cleanup. Little bit of project cleanup.