final fixes
main view altered