Cleaned up templates a bit
A couple of layout fixes