Improved UI management
Added some model classes