modified views and templates to work better