Major UI/UX fixes, added IE, Firefox, Opera support
Merge conflict resolution