Option Layout

Try to merge :)