Fix required fields
Responsive buttons
Merge with master