Added bootstrap grid / fixed global vars