Updated user views and layouts