added UI and layouting changes.