Moved TakstID to the left
Merge branch 'master' into test