Style Changes and fixed overflow