Some works on frontend

Can we use `core modules` instead?