Updated the look a bit and organized the code.