add hat moffat without much success, fix margins