Final UI modifications