Likely fixed clock on every page issue. Also likely fixed button mapping
problems. General cleanup and method consolidation.