Completed merge with html and styling