Added bootstrap layout and fixed label