Added styles and made some improvements almost there