fixed octicon, spacing issues etc.