minor layout changes
updated todos