Fix right padding on cards
Updated todos