More updates to main app.