doing a pull as haven't worked on tnt for a while
Merge branch 'dev' of github.com:grujic/tnt into dev
Squashed a lot of the input pages vertically to save space