Changed map size and body margin and padding
Merge