Changed some styles and do it more correctly