Fixed default settings
NP Stage 2. Small redesign