Momentjs bug fixed and some minor layout changes