Code Revision, feature additions.

Added support for locking icon
Added support for text input fields