Added configuration screen and new options