General layout complete, stuck with polish