Fixed container issue & menu active items