Extended second UI implementation
Second UI update
Conflicts