clean up views some more, fix minor logout issue