worked on some stacking issues in focus