Tons of graphic improvements! Code cleanup and restyle