clean up
fixed some layout issues, added spaces