Miscellaneous UI enhancements

Close modal windows appropriately for user experience. Correct display on admin panel.