Added more frontend stuff