Updated style
Imported changes from App-Useful