Improve ficha skin with new tables