responsive part II + some fixes