working on UI and bug fixes
test