Stabilisation & ui work