Simplify indentation, add blocking modals. Fixes #412