[#759] Fixed overall responsiveness

@kardan or @KasperBrandt  could you merge this please.