Some tweaks, rudimentary styling