Added toolbar and button