New look, and fixes