small fixes
major reworking of view layer
first