Cleaned up the code some

Also threw in logos everywhere, just so we have them all on one page