Refactoring
Fixed top and bottom.