experimenting with new layout
fixed conflict