Changed Add Question/Anwser to floating icon
Merge