Views pimping and fixes