Completing merchant faqs

+ some other UI changes here & there