layouts working, icons added