Fixing Q & A layout
Merge