Re-arranged the right controls a bit