options layout changed
reformat code