CSS improvements and better focus when adding Cards