a lot of bugfixes and right menu icons