Update to layout general design still need input