Improved styles, added more spacing