Moved things around

Should display properly now.