Issue #46 , remove redundant views and add flash message