Some changes
Removed some code changed some numbers
Merge branch 'Heavy-css-edits'