Reworked view structure, fixed tests