Improved design for tablets, added files with db indexes