Minor changes
Implemented feature to auto-select next fields