Everything working, refactored, styling changes.