layout changes + some fixes v1...