started work on fixing views