Added toolbar button, fixed redirect