bugfixes in ui and adaptation switching