added structural comments, modified helpers and media queries