Removed the close button and styled the rest of the form
Merge branch 'develop' into base-from-develop
Layout fixes
Added the logo and adjusted the marker expanded image
Proper size for the icon
Merge branch 'base-from-develop' into test
Merge branch 'test' into develop