Changes in MainView for FlareUp