Moved things around slightly
Updated header