Correct options and some layout fixing.