Commited GUI almost finished