add category field to questions and overview field to surveys
testing push is working correctly
Changed buttons to links, added class btn
fixed merge conflicts