Added cleaner options layout