fix layout
final fix