Some minor cleaning up [ci skip].
Done getting rid of the flickering in the CellML Annotation and Single Cell views (closes #405).