Large refactor
Added some result styles