Form, text and sidebar fixes