Interim commit - UI wokring before switching to programatic UI creation