Reworked the top up gas section and introduced CF functionality.