fixed file names
using backbone model updates
clean up + better layout