Better options and layout