Clean up templates + add tables page