Old tweaks that were never committed
Reverted back to old design, mostly