Fixes in main view