Settings show current value

Added Documentation
Refactoring