Fix indentation, menu registration, string concentration errors