Feature/13 options panel