Augmentator fix with some bad nommed variable and restylish view