Moved stamp name and city name
Added margins back