Merge "ui: Refactor the declaration orders."