minor ui changes and code changes