preliminary responsive styling
Merge