Added pop up message and controls