Almost there

Got only a couple of tweaks and a bit of balancing left to go :smile: Screenshot from 2018-08-13 18-19-41.png