PAS: compartor improvements + gui improvements + delete legacy code
(cherry picked from commit 3898854a7935e39303e571670e178fe6e07c9b3b)