make responsive
add some controller tests
solve conflict on accepted language