changed layout to my own