fix responsive issue

closes #118
resolve conflict