optimizations, beautifying and new gui button!