code formatting, small look and feel update, and removed fields limiting setting, (just return all fields)