Add base.html and button close fix