Clean up currenValues view and better style of dashboard