Simplifies modal system, adds styles scroll bar for ace editor.
Merge remote-tracking branch 'origin/jeremy'