some fixes
fixed small bug
fixed bug
fixed merge
fixes
some more adjustments for responsiveness