Added spec hud elements

Also cleaned up a bunch of files