Wip/110 ui fixes merge