rearranged UI elements to keep like things together better