added dynamic height
fixed initial layout
need to fix files
fixed merge