lunch updates to ui - more cleanup.