added password protection and simplified views