Moved content around a bit