Some front end changes/fixes