more code clean up, css fixes, remove ids