Added more frontend stuffs