Some tweaks + styling improvements