Minor fixes and improvements
Create and init UI