[WIP] UI modernization and fixes