UI is almost done

UI is almost done