Updated Views, Cleaned up some code, fixed State issue