Clean-up Message Form, add navigation links