added sidebar frame
fixed merge issue home.html
add resource
sidebar
form