changes in design. Modal implemented