Fixing list view
Merge branch 'APD-25-Structure_details' of local repository into APD-25