added fontawesome4 and generic code clean up