Some restylin' and adding some icons