fontawesome icons + minor changes