fixed small bugs and padding/borders