Natalia: Fixing stack for the ui