Front end

Front-end changes to be merged with development branch.
This section tag needs to be closed.