added remove button. layouting changes