Chnaged layout and added classes