Fix layout, add Submit button (no functionality yet)