UI Modified by Duan YiChun