Bit of code cleanup, show all content in active card, animation fixes