User Interfaces #18, #24, #29

All changes includes user interface and related changes.