More work on options panel, added password reset