cleaned code, fixed UI slightly