Front end

Front-end changes to be merged with development branch.
I realise the type attribute is not needed here, but for coding standards, can you please leave it?