Changed the layout so it resembles sirxemic's design a little more.