Fixed a couple of issues with sending numeric metadata; Fixed up layout