some little fixes in main view