Minor corrections
Fixed miscommit
Renamed layout custom to main