Following page: Fix overflow and borders