sizing and border bugfix