Remove unwanted tabs and change DB design