Design - changes by Emanuel

QA Fixes