Style tweaks and more responsive