Fish-Pi layout complete