merged board branch
Added color to nav and base cards page
merge drew branch into mine, fixed minor conflicts