Improve graphical interface and improve performance