Add borders, fix alignment