fixed some errors, changed layout