Few tweaks to angular elements