updated code - with solid layout