DOM rearrangement and keyboard hide on enter

DOM rearrangement and keyboard hide on enter