Moving options to the top for consistency