fixed views and some json
merged base.js