Styling branch

Updates with Joe's JS