Fixed dimens.xml and other values cleanup