Fixed Various UI/UX Errors