Feature/70 ui improvements