Added things, changed layout