Bug correction + style changed