changed styles and added awrapper