Cleaned up the popup; looks way neater now