Views updated
Fixed button on index
merge master