desighn improvments
done