Merged issues plus modal working a bit better