finally fixed layout