fixing stray redirects
shifting more of the output to being theme-based instead of just output directly
removing unneeded/unused permissions checks