extra eggache ui enhancement and extended code preparation