view revamp, broke some things for now