[CORE-50] Improved UI