lots of refactoring
fix rounded images (cross browser)
Merge remote-tracking branch 'origin/master'