merge emoose's changes, fix blank label appearing on board page