Real start of M3
Simplified naming slightly
Quick fix for sidebar content overflowing onto content