Updates, removed unnecessary code

Default tiny templates finished
Layout altered