General cleanup
Some fixes for Support page