Moved elements around to make prettier