Task #256: Changed html structture and translate items
Merge remote-tracking branch 'origin/256' into test