Frontend changes for merge