Added proper partials and some ajax