improved views and added js