Major UI improvements
Conflits solved