Drop sliding menu, using action basr tabs instead
Merge some conflict files