Some enable/disable controls added. End of the day work.