Fixed a more MVC style to the code. Put everything together except the labellist that still needs some refactoring.