Added UI modules and integration