cleaned code up
improved UI