Updated User Interface and added features