Merge pull request #22 from featdd/development

Merge Development (Release 2.1.0)
[TASK] Small TCA and CSS Fixes