Refactor some stuff.
Infobar almost works but there's something wrong w/ templating.