Removed Modal while researching best implementation, fixed some logic issues.