Fix flat buttons
Fix list-row