Improve modal component