Feature/519 clean up wt page