Fixed layout and tags

Fixed layout and tags