BS.22.1.1

Optimized some tables and views / Optimized some code / UI tweaks / Minor fixes