revamped user facing views