Fixed sticky border

Fixed sticky border and added more comments
8/26