Layout updates; 'esc' functionality for modals