Cleanup, positioning fixes