Moved stuff around to provide a better layout