Design - changes by Sonia

Style fixes for issues