UI improvements
Merge with README update