Fix template issues, move site design closer to something presentable