Update based on review comments
Add message when no activity loaded