Latest code changes

Some UI elements added.