Added Available/Not Available widgets, fixed layout