updates to main screen
Merge branch 'main-updates'