Use proper widget layout