UI now simplified significantly