updated front styles and article view styles
resolve merge conflict