ui and handler changes