Feature/redesign

Just minor design issues.