Added fill in intent support for widget / improved layout