fixing some front-end problems #frontendproblems
fixing merge conflict