Issue 34

Hi Roberto,

I've moved all html on issue 34 to layout files. Using a named array to pass through the variables