Improve UI (still horrible)
G