Issue #4 - Updates to Macrohpage model and user interface.