Fix the layout a boit and remove unused links from items