Added Settings Form
Fixed bug in Display and added some stuff