Based edit modal content around slightly left-of-center line
Based settings tab content around left-of-center line
Cleaned up settings modal to look more like the edit modal
Merge branch 'css-tweaks'