Improve help texts and layout