Fix reponsiveness issues, closes #107

@jdiez17 Ready for merge.