New marker icons
New layout