#9 frontend some changes