Basic branded added
Add status icons
Some cleanup