completed design + fixed redirect_to links