Fix overflow
Continuing css tweaks