Fixed property pages (finally) + added map