Refactoring code and removes cfp button