fixed some layout issues with the updated webkey handling