Changed table form td align to right.
Added ID to some tags.
Merge remote-tracking branch 'origin/develop' into develop