Merge pull request #18 from Benczyk/master

Merge + improvements (estate modal in nav...) + bugFix
Merge remote-tracking branch 'upstream/master'