making changes to general theme together with navbar and footer.
-fixes to the FAQ page
Changes to the views
resolving conflicts