Completed initial frontend merge