Apply changes from https://github.com/mrsinguyen/go1_ui/pull/2.