Update currently working UI setup