Added bootstrap and did layout fixes