Design polishing
Last commit was incomplete