Minor feedback
Use pub/sub to refresh instead of hardcoding into modals
Final tweaks