Made user interface more friendly