add glyphicons, refactor models