UI implementation continued