adding UI
bit of cleanup
More Cleanup!