Front end

Front-end changes to be merged with development branch.