Added ViewHolder and fixed layout