Safari Bug Fixing
Code Cleanup
lockUI fit and finish