Re-Design Merge

Merge re-design with master to continue work.

Reason:
Images don't show in second branch, unknown why.