moved psd out, more layout work