Niko trimmed pictures, edited map function, fixed some HAML