Issue #393 - Add final design