Fixed concepts. Looks good and working!! also prototype overview page
same as before
Final commit