Better differentiate between frontend and backend and small beauty improvements