Mostly css updates, container refactor