major rewrite, add action bar