Added Constellation and tweaked views