worked on options and html structure
merged