Added buttons, url_for()