Lots of updates to modal logic and UI