styling and minor functionality fixes