added bootstrap and fixed structures