Updated some code at the model layer for a more semantical choice. Also updated styling application wide.