Simplify GUI, improve rendering and fix some bugs