Few UI fixes + new context root