REPORTS-197: Re-grouped GUI elements