Fixed stupid styling
Added map