Minor.
Fix weird slightly-too-right placement of navbar-right
Some more fixes to nasty modal dialog logic