Updated everything with new layout