Card UI Layout, more fixes