Re-arrange
Update UI components