Few fixes and added bootstrap