Fix #3 , Worked on #11

Need to handle the QA search and make the page look better