Make SFCell a bit more readable and change bill cell layout