slight design fixes
and screw you, auto database index xml whatever XD