Refactored page - all components have their own function now