Add minimal-ui and some change