some repo cleanup
nicer views and some tests