-Fix bugs
-Add context action bar support