Major Front-end changes only