#649 Improve responsive design