Added missing options and set layout