Improved Card Layout