css, container and other tweaks