Added Card layout, Changed Map FABs