fixed margin error, deleted unused code