added button for reporting page, some name refactoring