Beta 2 with some new graphical changes