Attempt at restyle
Merge with alex_dev