Switched query to right side, more formatting