Fix some issues and imvrove views