several issues resolved and new layouts created