Fix overflows

and remove more redundant styles