incorporated Jamals changes
fixed merge conflict in boxify.css