Tweaks to form layout (more responsive)