some css fixing and bug fixing
Merge branch 'version_2_1' of github.com:coorasse/Airesis into version_2_1