Upgrade for issue #8, adding home button and fixing go back for reports