changed layout thanks pien