fixed gui - still needs minor tweeks