Moved fields around in the search view mode
Updated coding style
Added missing function documentation
Merge remote-tracking branch 'origin' into release