div setup for CSS
fixed merge issues