Refined appearance

@stachern Just general stuff. More later.