Cleaned up organization of cards and drop down classes