Revert + more

CSS and moved modals below container element