Display improvements
Maps in Observatory
Merge pull request #20 from Benczyk/master

Maps in Observatory & small display improvements