Refactor/front end

Refactor/front end