Fixed titling, added top/bottom field