gui started
gui merged
little fixes