improve views and add templates