fixed directional stuff, added combined view