shorten input lengths
Merge branch 'master' into walport-water
begun styling waterfall as well as shifting the functionality towards our final design
Merge branch 'walport-water' into testing