finished

GUI finished, structure fixed