Structure refactoring
updated _MainLayout with Helpers
small fixes and refactoring of pages
Merge remote-tracking branch 'origin/Development' into Astron
Merge remote-tracking branch 'origin/Development' into maaak