Fix broken AFC/R (#199) and also work on styling