move menu block to partial template
optimize submit form UX