UI improvements progress
Merging Angel changes