Moved content around for a better layout