Feature/refactoring

- more performance :)
- option:selected changed to val()