Dev

v1.1.1 and GUI fixes