initial commit of rebuilt ui structure