Clean up and minor modifications to styling/presentation