WIP - Redesign of options page