Card padding tweaks
Removes obsolete templates and controllers