Updated UI

Modified Form to include icon, system buttons and manage the
enable/disable of the on/off buttons