Card layout instead of tab

Addresses #315, as well as general cleaning.