[READY] UI modernization and fixes