Changed ID to class
Added lock dialog