Use template file, improve looks? maybe.