Fixed References Issue and Updated MainView