Responsive design, some bugfix