fix layout final