Quick design & content fix 15m