Merge initial dashboard view
Fix front page display for logged-in users