[#31] Move overview tables