Added modal boxes and finished interface