Added a new wrapper and more style