Cleaned code, added UI