Fixes views-- still needs cleanup