Refactor Disease List and Option Panel