Further cleaning views and threaded location builder.