updated options and restructured layout