Modify Models,views and AdminPage

Rely on story1 and story4