add ui and fix select