Improved UI. Basic Architecture