Add more frontend validation