Fix option, assignment and preview layout