Architecture and Ux improvements.