Added code-snippet
added onOptionsMenu and other features