fixed more UI