Changes for reporting functionality
Changes for reporting, modified layout to use menus