Improve layout and FAQs