Adjusted main state rendering..