Updated main screens for app