home view layout
fixed merge issue