More css cleanup/separation, new box for fitbit