Refactor CRF helpers and improve basic bottle UI