removed unused views, template remastered
fix minor bugs