improving views
fixed minor bugs