Rearranged buttons in all modals, added logout button to results page