Changed option editing

- Added lists to options editing view
- Ugly solution, but it will work