Litte polishing of some views and removed some weird things added as a result of merging