Refactored some class names, converted user margins to percentages but still need tweaking. Portfolio margins still need tweaking.