Infobar refactor

Sorry about the massive change, at this point pull requesting the commits would take longer to split up and read than just going over the files.