Admin improvements, updates Tablets dependency