Got the new look up and running. Cleaned up the code and changed files around