Changed border character + more containers