Added Button and CheckBox objects. More Code cleanup and optimization.