Fixes for the bug that Marian was running into
Bugfix with displayed points not matching
default options or buttongs.