Fixed widht and height issues