Cleanup and more flexible model for main page