improved gui, added functionality