Fixed regex
Added styles