#586 Multiple improvements on responsive design