Fixed some errors with variables and added styles