Patch June

UI/UX Improvements and Security Fixes