Ian/80 20

@nicolashery ready for review i worked one the items in this card https://trello.com/c/pw8nT1Bl/40-5-blip-80-20-fixes-to-interaction