Work in progress pull request with lots of improvements in UI