Added favico, converted tabs to spaces
Fixing conflicts
Fixed a div ordering issue