Updated everything according to Fabio's mockups. Either going to clean it up or start building the functionality.