Reorder stuff for symantic clarity
search ui