Bug fixes,new views,refactoring
New views