improved to look and feel
improved to look and feel
fixing conflicts