Features/design optimizings

Something weird is happening.