clean up base dir
add appbar to sink
fix up travis