Layout improved, more graphical clean up