Code cleanup.
Added properties and methods.
Click events.
Code cleanup.