Updated styles and separated markup into partials