fixed minor bugs on views
moving all