UI completed and updated