strip ampersands
cleanup layout