Accidentally merged in changeds from all branch
Add redirect layout
Remove unneeded link color