Reorganized panels to look nicer