Add top border, add fade out, rename short variables