Updated style and fixed bug!