Feature/tw 17 ui