Modal Interface Updates & Bug Fixes