Removed unneeded packages and added modal functionality