added ui and build fixes