updated gui + fixed minor reset bugs