progress on #15, added textview for speed

Also, consolidated some xml files using include tags