Added more views and password check