Add more frontend logic