Code style + cleanup
Fixed issue with views-specifics, added tunnelling