Switching Elusive Icons to Font Awesome + some UI changes