Layout redo, finished PA_Master