Front end

Front-end changes to be merged with development branch.
Move this block one line down.