Table Layout modified, added class SensorrRow, code clean up