Homepage layout finished
Map almost working
Merge branch 'development' into ux